diff --git a/plugin/Live/index.php b/plugin/Live/index.php index 46af154f8..908db054e 100644 --- a/plugin/Live/index.php +++ b/plugin/Live/index.php @@ -1,315 +1,328 @@ getDataObject(); if (!empty($_GET['c'])) { $user = User::getChannelOwner($_GET['c']); if (!empty($user)) { $_GET['u'] = $user['user']; } } if (!empty($_GET['c'])) { $user = User::getChannelOwner($_GET['c']); if ($user['status'] !== 'a') { header("Location: {$global['webSiteRootURL']}"); } } if (!empty($_GET['u']) && !empty($_GET['embedv2'])) { include $global['systemRootPath'] . 'plugin/Live/view/videoEmbededV2.php'; exit; } else if (!empty($_GET['u']) && !empty($_GET['embed'])) { include $global['systemRootPath'] . 'plugin/Live/view/videoEmbeded.php'; exit; } else if (!empty($_GET['u'])) { include $global['systemRootPath'] . 'plugin/Live/view/modeYoutubeLive.php'; exit; } else if (!User::isLogged()) { gotToLoginAndComeBackHere(""); exit; } else if (!User::canStream()) { forbiddenPage(__($obj->streamDeniedMsg)); } require_once $global['systemRootPath'] . 'objects/userGroups.php'; require_once $global['systemRootPath'] . 'objects/functions.php'; require_once $global['systemRootPath'] . 'plugin/Live/Objects/LiveTransmition.php'; $users_id = User::getId(); if (!empty($_GET['users_id']) && User::isAdmin()) { $users_id = intval($_GET['users_id']); } // if user already have a key $trasnmition = LiveTransmition::createTransmitionIfNeed($users_id); $getLiveKey = array('key' => $trasnmition['key'], 'live_servers_id' => Live::getLiveServersIdRequest()); setLiveKey($trasnmition['key'], Live::getLiveServersIdRequest(), @$_REQUEST['live_index']); if (!empty($_GET['resetKey'])) { LiveTransmition::resetTransmitionKey($users_id); header("Location: {$global['webSiteRootURL']}plugin/Live/"); exit; } -$aspectRatio = "16:9"; -$vjsClass = "vjs-16-9"; - $trans = new LiveTransmition($trasnmition['id']); $groups = $trans->getGroups(); //check if channel name exists $channelName = User::getUserChannelName(); if (empty($channelName)) { $channelName = uniqid(); $user = new User($users_id); $user->setChannelName($channelName); $user->save(); } - -$col1Class = "col-md-12 col-lg-12"; -$col2Class = "hidden"; -$chat2 = AVideoPlugin::getObjectDataIfEnabled("Chat2"); -if (!empty($chat2) && !empty($chat2->useStaticLayout)) { - $col1Class = "col-md-8 col-lg-8"; - $col2Class = "col-md-4 col-lg-4"; -} +//$global['ignoreChat2'] = 1; ?> <?php echo __("Live") . $config->getPageTitleSeparator() . $config->getWebSiteTitle(); ?>
-
-
-
- + + +
+
+
-
-
-
-
+
+
+
+ +
+
+
+
+
+ +
+
+ +
+
-
+
-
- -
+
getChat($trasnmition['key']); ?> diff --git a/plugin/Live/indexCol1.php b/plugin/Live/indexCol1.php index fadbc2f0a..a506c506a 100644 --- a/plugin/Live/indexCol1.php +++ b/plugin/Live/indexCol1.php @@ -1,66 +1,3 @@ - -
-
- - - - - - -
-
-
-
- -
- - -
-
- -
\ No newline at end of file diff --git a/plugin/Live/indexColCam.php b/plugin/Live/indexColCam.php new file mode 100644 index 000000000..4e3cb4018 --- /dev/null +++ b/plugin/Live/indexColCam.php @@ -0,0 +1,39 @@ + +
+
+ +
+
+ + + + + +
+ +
\ No newline at end of file diff --git a/plugin/Live/meet.php b/plugin/Live/meet.php index e12b14375..28f51f1c2 100644 --- a/plugin/Live/meet.php +++ b/plugin/Live/meet.php @@ -1,238 +1,246 @@ ".__("The server is not ready").""; + echo "" . __("The server is not ready") . ""; return ''; } if ($meetDomain == 'custom') { $domain = $objM->CUSTOM_JITSI_DOMAIN; } else { $domain = "{$meetDomain}?getRTMPLink=" . urlencode(Live::getRTMPLink(User::getId())); } $dropURL = "{$global['webSiteRootURL']}plugin/Live/droplive.json.php?live_transmition_id={$trasnmition['id']}&live_servers_id=" . Live::getCurrentLiveServersId(); ?>
\ No newline at end of file diff --git a/plugin/Live/tabs/tabStreamKey.php b/plugin/Live/tabs/tabStreamKey.php index e339ed359..6a14bcf1c 100644 --- a/plugin/Live/tabs/tabStreamKey.php +++ b/plugin/Live/tabs/tabStreamKey.php @@ -1,91 +1,29 @@ -allowMultipleLivesPerUser) { - $onliveApplications = Live::getLivesOnlineFromKey($key); - foreach ($onliveApplications as $value) { - if (empty($value['key'])) { - continue; - } - if (preg_match('/' . $trasnmition['key'] . '/', $value['key'])) { - $onliveApplications[] = '' . __('LIVE NOW') . ' ' . $value['title'] . ''; - } - } -} -$key = $liveStreamObject->getKeyWithIndex(true); -?> - -
-
()
-
-
- - - - -
-
- -
- - "> - - -
-
- -
-
- -
-
- -
-
- -
-
\ No newline at end of file diff --git a/plugin/Live/tabs/tabStreamSettings.php b/plugin/Live/tabs/tabStreamSettings.php index fc5b50f1c..1caec32a8 100644 --- a/plugin/Live/tabs/tabStreamSettings.php +++ b/plugin/Live/tabs/tabStreamSettings.php @@ -1,111 +1,173 @@ +allowMultipleLivesPerUser) { + $onliveApplications = Live::getLivesOnlineFromKey($key); + foreach ($onliveApplications as $value) { + if (empty($value['key'])) { + continue; + } + if (preg_match('/' . $trasnmition['key'] . '/', $value['key'])) { + $onliveApplications[] = '' . __('LIVE NOW') . ' ' . $value['title'] . ''; + } + } +} +$key = $liveStreamObject->getKeyWithIndex(true); +?> + +
+
()
+
+
+ + + + +
+
+ +
+ + "> + + +
+
+ +
+
+ +
+
+ +
+
+ +
+
onchange="saveStream();"/>
onchange="saveStream();"/>

/>
diff --git a/plugin/Live/webRTC.php b/plugin/Live/webRTC.php index d117c9fd9..23b0eb496 100644 --- a/plugin/Live/webRTC.php +++ b/plugin/Live/webRTC.php @@ -1,62 +1,73 @@ - \ No newline at end of file